home *** CD-ROM | disk | FTP | other *** search
/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_control-center.idb / usr / freeware / src / control-center / patches.z / patches
Encoding:
Text File  |  1999-07-16  |  14.2 KB  |  367 lines
  1. --- ./po/cat-id-tbl.c    Thu Apr  1 18:25:35 1999
  2. +++ ../control-center-1.0.5/./po/cat-id-tbl.c    Tue Apr 13 17:51:52 1999
  3. @@ -76,9 +76,7 @@
  4.    {"Settings", 67},
  5.    {"RANDOM SCREENSAVER", 68},
  6.    {"Screen Saver", 69},
  7. -  {"\
  8. -Pressing this button will popup a dialogbox that will help you setup the \
  9. -current screensaver.", 70},
  10. +  {"Pressing this button will popup a dialogbox that will help you setup the current screensaver.", 70},
  11.    {"Screen Saver Settings", 71},
  12.    {"Start After ", 72},
  13.    {" Minutes.", 73},
  14. @@ -104,8 +102,7 @@
  15.    {"Select sound file", 93},
  16.    {"Play", 94},
  17.    {"Sound Events", 95},
  18. -  {"\
  19. -This copy of the GNOME control center was not compiled with sound support", 96},
  20. +  {"This copy of the GNOME control center was not compiled with sound support", 96},
  21.    {"The sound file for this event does not exist.", 97},
  22.    {"\
  23.  The sound file for this event does not exist.\n\
  24. @@ -192,9 +189,7 @@
  25.    {"Help with the GNOME control-center.", 170},
  26.    {"Warning:", 171},
  27.    {"Discard all changes", 172},
  28. -  {"\
  29. -The following modules have had changes made, but not committed.  If you \
  30. -would like to edit them, please double click on the appropriate entry.", 173},
  31. +  {"The following modules have had changes made, but not committed.  If you would like to edit them, please double click on the appropriate entry.", 173},
  32.    {"Control Center", 174},
  33.  };
  34.  
  35. --- ./po/control-center.pot    Thu Apr  1 18:22:13 1999
  36. +++ ../control-center-1.0.5/./po/control-center.pot    Wed Apr 14 10:40:25 1999
  37. @@ -1,18 +1,10 @@
  38. -# SOME DESCRIPTIVE TITLE.
  39. -# Copyright (C) YEAR Free Software Foundation, Inc.
  40. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  41. -#
  42. -#, fuzzy
  43.  msgid ""
  44.  msgstr ""
  45. -"Project-Id-Version: PACKAGE VERSION\n"
  46. -"POT-Creation-Date: 1999-04-01 18:22-0500\n"
  47. -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  48. -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  49. -"Language-Team: LANGUAGE <LL@li.org>\n"
  50. -"MIME-Version: 1.0\n"
  51. -"Content-Type: text/plain; charset=CHARSET\n"
  52. -"Content-Transfer-Encoding: ENCODING\n"
  53. +"Date: 1999-04-14 10:40:25-0400\n"
  54. +"From: David Kaelbling,DER-200,,508-520-7826 <drk@orchietta>\n"
  55. +"Content-Type: text/plain; charset=\n"
  56. +"Xgettext-Options: --default-domain=control-center --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
  57. +"Files: capplets/background-properties/property-background.c capplets/bell-properties/bell-properties.c capplets/gnome-edit-properties/gnome-edit-properties.c capplets/keyboard-properties/keyboard-properties.c capplets/mouse-properties/mouse-properties.c capplets/screensaver-properties/callbacks.c capplets/screensaver-properties/screensaver-dialog.c capplets/screensaver-properties/screensaver-properties-capplet.c capplets/session-properties/session-properties.c capplets/sound-properties/sound-properties.c capplets/theme-switcher/gui.c capplets/ui-properties/ui-properties.c capplets/url-properties/url-properties.c control-center/callbacks.c control-center/capplet-manager.c control-center/capplet-widget-libs.c control-center/capplet-widget.c control-center/corba-glue.c control-center/main.c\n"
  58.  
  59.  #: capplets/background-properties/property-background.c:618
  60.  msgid "Color"
  61. @@ -27,6 +19,7 @@
  62.  msgid "Color 2"
  63.  msgstr ""
  64.  
  65. +#. The right side
  66.  #: capplets/background-properties/property-background.c:654
  67.  msgid "Solid"
  68.  msgstr ""
  69. @@ -51,9 +44,7 @@
  70.  msgid "Can't find an hbox, using a normal file selection"
  71.  msgstr ""
  72.  
  73. -#: capplets/background-properties/property-background.c:887
  74. -#: capplets/screensaver-properties/screensaver-dialog.c:25
  75. -#: capplets/theme-switcher/gui.c:225 capplets/theme-switcher/gui.c:281
  76. +#: capplets/background-properties/property-background.c:887 capplets/screensaver-properties/screensaver-dialog.c:25 capplets/theme-switcher/gui.c:225 capplets/theme-switcher/gui.c:281
  77.  msgid "Preview"
  78.  msgstr ""
  79.  
  80. @@ -85,56 +76,55 @@
  81.  msgid "Tiled"
  82.  msgstr ""
  83.  
  84. -#: capplets/background-properties/property-background.c:1350
  85. +#: capplets/background-properties/property-background.c:1351
  86.  msgid "Disable background selection"
  87.  msgstr ""
  88.  
  89. -#: capplets/background-properties/property-background.c:1479
  90. +#: capplets/background-properties/property-background.c:1480
  91.  msgid "Set parameters from saved state and exit"
  92.  msgstr ""
  93.  
  94. -#: capplets/background-properties/property-background.c:1480
  95. +#: capplets/background-properties/property-background.c:1481
  96.  msgid "IMAGE"
  97.  msgstr ""
  98.  
  99. -#: capplets/background-properties/property-background.c:1480
  100. +#: capplets/background-properties/property-background.c:1481
  101.  msgid "Sets the wallpaper to the value specified"
  102.  msgstr ""
  103.  
  104. -#: capplets/background-properties/property-background.c:1481
  105. -#: capplets/background-properties/property-background.c:1482
  106. +#: capplets/background-properties/property-background.c:1482 capplets/background-properties/property-background.c:1483
  107.  msgid "COLOR"
  108.  msgstr ""
  109.  
  110. -#: capplets/background-properties/property-background.c:1481
  111. +#: capplets/background-properties/property-background.c:1482
  112.  msgid "Specifies the background color"
  113.  msgstr ""
  114.  
  115. -#: capplets/background-properties/property-background.c:1482
  116. +#: capplets/background-properties/property-background.c:1483
  117.  msgid "Specifies end background color for gradient"
  118.  msgstr ""
  119.  
  120. -#: capplets/background-properties/property-background.c:1483
  121. +#: capplets/background-properties/property-background.c:1484
  122.  msgid "ORIENT"
  123.  msgstr ""
  124.  
  125. -#: capplets/background-properties/property-background.c:1483
  126. +#: capplets/background-properties/property-background.c:1484
  127.  msgid "Gradient orientation: vertical or horizontal"
  128.  msgstr ""
  129.  
  130. -#: capplets/background-properties/property-background.c:1484
  131. +#: capplets/background-properties/property-background.c:1485
  132.  msgid "Use a solid fill for the background"
  133.  msgstr ""
  134.  
  135. -#: capplets/background-properties/property-background.c:1485
  136. +#: capplets/background-properties/property-background.c:1486
  137.  msgid "Use a gradient fill for the background"
  138.  msgstr ""
  139.  
  140. -#: capplets/background-properties/property-background.c:1486
  141. +#: capplets/background-properties/property-background.c:1487
  142.  msgid "MODE"
  143.  msgstr ""
  144.  
  145. -#: capplets/background-properties/property-background.c:1486
  146. +#: capplets/background-properties/property-background.c:1487
  147.  msgid "Display wallpaper: tiled, centered, scaled or ratio"
  148.  msgstr ""
  149.  
  150. @@ -255,8 +245,7 @@
  151.  msgid "Random Screensaver"
  152.  msgstr ""
  153.  
  154. -#: capplets/screensaver-properties/callbacks.c:494
  155. -#: capplets/screensaver-properties/screensaver-properties-capplet.c:54
  156. +#: capplets/screensaver-properties/callbacks.c:494 capplets/screensaver-properties/screensaver-properties-capplet.c:54
  157.  msgid "Settings..."
  158.  msgstr ""
  159.  
  160. @@ -294,12 +283,9 @@
  161.  msgstr ""
  162.  
  163.  #: capplets/screensaver-properties/screensaver-properties-capplet.c:59
  164. -msgid ""
  165. -"Pressing this button will popup a dialogbox that will help you setup the "
  166. -"current screensaver."
  167. +msgid "Pressing this button will popup a dialogbox that will help you setup the current screensaver."
  168.  msgstr ""
  169.  
  170. -#. set up the initial frame, and get a vbox in which to pack things.
  171.  #: capplets/screensaver-properties/screensaver-properties-capplet.c:85
  172.  msgid "Screen Saver Settings"
  173.  msgstr ""
  174. @@ -336,6 +322,7 @@
  175.  msgid "Screen Saver Demo"
  176.  msgstr ""
  177.  
  178. +#. table
  179.  #: capplets/session-properties/session-properties.c:147
  180.  msgid "Program:"
  181.  msgstr ""
  182. @@ -402,8 +389,7 @@
  183.  msgstr ""
  184.  
  185.  #: capplets/sound-properties/sound-properties.c:354
  186. -msgid ""
  187. -"This copy of the GNOME control center was not compiled with sound support"
  188. +msgid "This copy of the GNOME control center was not compiled with sound support"
  189.  msgstr ""
  190.  
  191.  #: capplets/sound-properties/sound-properties.c:757
  192. @@ -422,7 +408,6 @@
  193.  msgstr ""
  194.  
  195.  #: capplets/theme-switcher/gui.c:83
  196. -#, c-format
  197.  msgid ""
  198.  "Error installing theme:\n"
  199.  "'%s'\n"
  200. @@ -499,6 +484,7 @@
  201.  msgid "Dialogs are treated specially by window manager"
  202.  msgstr ""
  203.  
  204. +#. looking for better descriptions here...
  205.  #: capplets/ui-properties/ui-properties.c:79
  206.  msgid "Notebook"
  207.  msgstr ""
  208. @@ -716,7 +702,6 @@
  209.  msgid "Help with the GNOME control-center."
  210.  msgstr ""
  211.  
  212. -#. we create the widgets
  213.  #: control-center/main.c:58
  214.  msgid "Warning:"
  215.  msgstr ""
  216. @@ -725,11 +710,8 @@
  217.  msgid "Discard all changes"
  218.  msgstr ""
  219.  
  220. -#. ...labels, etc
  221.  #: control-center/main.c:67
  222. -msgid ""
  223. -"The following modules have had changes made, but not committed.  If you "
  224. -"would like to edit them, please double click on the appropriate entry."
  225. +msgid "The following modules have had changes made, but not committed.  If you would like to edit them, please double click on the appropriate entry."
  226.  msgstr ""
  227.  
  228.  #. create the app
  229. --- ./capplets/background-properties/property-background.c    Thu Apr  1 18:22:07 1999
  230. +++ ../control-center-1.0.5/./capplets/background-properties/property-background.c    Wed Apr 14 10:39:44 1999
  231. @@ -1294,6 +1294,7 @@
  232.          }
  233.          break;
  234.      default:
  235. +        break;
  236.      }
  237.  }
  238.  
  239. --- ./capplets/session-properties/gsm-client-list.c    Wed Mar 24 04:43:59 1999
  240. +++ ../control-center-1.0.5/./capplets/session-properties/gsm-client-list.c    Tue Apr 13 18:05:11 1999
  241. @@ -129,7 +129,12 @@
  242.    GtkCList* clist = (GtkCList*) client_list;
  243.    GdkFont*  font;
  244.    gint      i;
  245. -  gchar*    titles[4] = { _("Order"), _("Style"), _("State"), _("Program") };
  246. +  gchar*    titles[4];
  247. +
  248. +  titles[0] = _("Order");
  249. +  titles[1] = _("Style");
  250. +  titles[2] = _("State");
  251. +  titles[3] = _("Program");
  252.  
  253.    client_list->client_editor = gsm_client_editor_new ();
  254.    client_list->session   = NULL;
  255. --- ./capplets/session-properties/gsm-protocol.c    Wed Mar 24 04:44:01 1999
  256. +++ ../control-center-1.0.5/./capplets/session-properties/gsm-protocol.c    Wed Apr 14 10:07:05 1999
  257. @@ -226,7 +226,7 @@
  258.        command (the_protocol, 
  259.             gsm_args_to_prop (GsmCommand, 
  260.                   GsmDeselectClientEvents, NULL), NULL);
  261. -      live_session == NULL;
  262. +      live_session = NULL;
  263.      }
  264.    else
  265.      {
  266. @@ -497,7 +497,7 @@
  267.    
  268.    /* Hmm, may need to be override redirect as well since WMs are quite
  269.       likely to be the source of the errors... */
  270. -  //dialog = gnome_warning_dialog (message);
  271. +/* dialog = gnome_warning_dialog (message);    */
  272.    dialog = gnome_message_box_new (message, GNOME_MESSAGE_BOX_WARNING, NULL);
  273.    gnome_dialog_append_button_with_pixmap (GNOME_DIALOG (dialog),
  274.                        _("Remove Program"),
  275. --- ./capplets/session-properties/gsm-client-row.c    Wed Mar 24 04:44:00 1999
  276. +++ ../control-center-1.0.5/./capplets/session-properties/gsm-client-row.c    Tue Apr 13 18:06:18 1999
  277. @@ -157,7 +157,9 @@
  278.        GtkCList* clist = (GtkCList*)client_list;
  279.        guint row;
  280.        char temp[3];
  281. -      char* text[] = { temp, NULL, NULL, NULL };  
  282. +      char* text[] = { NULL, NULL, NULL, NULL };  
  283. +
  284. +      text[0] = temp;
  285.  
  286.        snprintf (temp, 3, "%.02d", client->order);
  287.        text[3] = client->command;
  288. --- ./capplets/ui-properties/ui-properties.c    Mon Mar  8 15:49:33 1999
  289. +++ ../control-center-1.0.5/./capplets/ui-properties/ui-properties.c    Tue Apr 13 18:02:51 1999
  290. @@ -324,7 +324,7 @@
  291.              gtk_check_button_new_with_label(_("Statusbar progress meter on right"));
  292.  
  293.            gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), 
  294. -                                      gnome_preferences_get_statusbar_meter_on_right);
  295. +                                      gnome_preferences_get_statusbar_meter_on_right());
  296.  
  297.            gtk_signal_connect(GTK_OBJECT(button), "toggled",
  298.                               GTK_SIGNAL_FUNC(checkbutton_cb),
  299. --- ./capplets/gnome-edit-properties/gnome-edit-properties.c    Fri Mar 26 11:19:38 1999
  300. +++ ../control-center-1.0.5/./capplets/gnome-edit-properties/gnome-edit-properties.c    Wed Apr 14 10:40:07 1999
  301. @@ -245,6 +245,7 @@
  302.          case -1:
  303.                  return 0;
  304.          default:
  305. +        break;
  306.          }
  307.  
  308.          edit_setup ();
  309. --- ./capplets/screensaver-properties/parser.c    Thu Apr  1 19:00:18 1999
  310. +++ ../control-center-1.0.5/./capplets/screensaver-properties/parser.c    Wed Apr 14 10:38:25 1999
  311. @@ -598,6 +598,7 @@
  312.                  set_color (ssd);
  313.                  break;
  314.          default:
  315. +                break;
  316.          }
  317.  }
  318.  static void
  319. --- ./capplets/screensaver-properties/screensaver-properties-capplet.c    Wed Mar 31 20:05:22 1999
  320. +++ ../control-center-1.0.5/./capplets/screensaver-properties/screensaver-properties-capplet.c    Tue Apr 13 18:00:09 1999
  321. @@ -248,8 +248,8 @@
  322.                  mypid = 0;
  323.                  mypid = gnome_config_get_bool ("/Screensaver/Default/dpms=false");
  324.                  if (mypid) {
  325. -                        mypid = gnome_config_get_string ("/Screensaver/Default/dpmsmins=20");
  326. -                        mypid += gnome_config_get_string ("/Screensaver/Default/waitmins=20");
  327. +                        mypid = gnome_config_get_int ("/Screensaver/Default/dpmsmins=20");
  328. +                        mypid += gnome_config_get_int ("/Screensaver/Default/waitmins=20");
  329.                          g_snprintf (dpmstime, 10, "%d",(gint) mypid * 60);
  330.                          r_command = g_strconcat ("xset dpms ", dpmsmins, " ", dpmsmins, " ", dpmsmins, NULL);
  331.                          system (r_command);
  332. --- ./control-center/corba-glue.c    Tue Mar  9 16:28:37 1999
  333. +++ ../control-center-1.0.5/./control-center/corba-glue.c    Tue Apr 13 17:51:40 1999
  334. @@ -82,8 +82,8 @@
  335.          PortableServer_ObjectId objid = {0, sizeof("control_center_interface"), "control_center_interface"};
  336.          PortableServer_POA poa;
  337.          CORBA_exception_init(&ev);
  338. -        //        gnome_init("desktop-manager", NULL, *argc, argv, 0, NULL);
  339. -        //        orb = CORBA_ORB_init(argc, argv, "orbit-local-orb", &ev);
  340. +/*      gnome_init("desktop-manager", NULL, *argc, argv, 0, NULL);      */
  341. +/*      orb = CORBA_ORB_init(argc, argv, "orbit-local-orb", &ev);       */
  342.  
  343.  
  344.  
  345. --- ./ltmain.sh    Thu Apr  1 18:27:04 1999
  346. +++ ../control-center-1.0.5/./ltmain.sh    Tue Apr 13 17:26:32 1999
  347. @@ -1604,7 +1604,7 @@
  348.  
  349.      irix)
  350.        major=`expr $current - $age + 1`
  351. -      versuffix="$major.$revision"
  352. +      versuffix=".$major"
  353.        verstring="sgi$major.$revision"
  354.  
  355.        # Add in all the interfaces that we are compatible with.
  356. --- ./ltconfig    Thu Apr  1 18:27:03 1999
  357. +++ ../control-center-1.0.5/./ltconfig    Tue Apr 13 17:25:45 1999
  358. @@ -1738,7 +1738,7 @@
  359.    # there either
  360.    sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
  361.    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
  362. -  deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" # or should it be pass_all?
  363. +  deplibs_check_method=pass_all
  364.    file_magic_cmd=/usr/bin/file
  365.    file_magic_test_file=`echo /lib${libsuff}/libc.so*`
  366.    ;;
  367.